Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 12:46:11 +0000 (12:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 12:46:11 +0000 (12:46 +0000)
commitaf6e6f4cc7e13bb3e3ad8ca80cbc3f67d3444a3c
tree3e6bbd7f76306e864b0b7cd056603614c688e61e
parent47da8c9839b6a165fefa1a55fa453378f7fa9d3c
parent666c9b3b6a7fc0d278addcac7120cf935700602d
Merge from mainline.